From a29474567ac20e4ac13160d1b421fd84dfa22556 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 24 Sep 2021 21:11:00 +0200 Subject: [PATCH] gdk: Remove gdkinternals.h --- gdk/gdk.c | 13 ++++------- gdk/gdkcairo.c | 4 +--- gdk/gdkcairocontext.c | 1 - gdk/gdkcairoprivate.h | 2 ++ gdk/gdkcursor.c | 1 - gdk/gdkdevice.c | 1 - gdk/gdkdevicetool.c | 2 +- gdk/gdkdisplay.c | 7 +++--- gdk/gdkdisplaymanager.c | 1 - gdk/gdkdrawcontext.c | 2 +- gdk/gdkdrop.c | 2 +- gdk/gdkevents.c | 1 - gdk/gdkframeclock.c | 1 - gdk/gdkframeclockidle.c | 2 +- gdk/gdkgl.c | 4 ++-- gdk/gdkglcontext.c | 1 - gdk/gdkglobals.c | 1 - gdk/gdkinternals.h | 43 ----------------------------------- gdk/gdkkeynames.c | 1 - gdk/gdkpixbuf-drawable.c | 1 - gdk/gdkseat.c | 1 - gdk/gdkseatdefault.c | 1 - gdk/gdksurface.c | 7 ++---- gdk/gdktexture.c | 1 - gdk/gdkvulkancontext.c | 1 - gdk/gdkvulkancontextprivate.h | 2 +- gtk/inspector/logs.c | 2 +- 27 files changed, 20 insertions(+), 86 deletions(-) delete mode 100644 gdk/gdkinternals.h diff --git a/gdk/gdk.c b/gdk/gdk.c index 9c4f941195..cd8c0bdcc8 100644 --- a/gdk/gdk.c +++ b/gdk/gdk.c @@ -26,18 +26,13 @@ #include "gdkversionmacros.h" -#include "gdkinternals.h" -#include "gdkintl.h" - #include "gdkresources.h" -#include "gdk-private.h" - #include "gdkconstructor.h" - -#ifndef HAVE_XCONVERTCASE -#include "gdkkeysyms.h" -#endif +#include "gdkdebug.h" +#include "gdkdisplay.h" +#include "gdkintl.h" +#include "gdk-private.h" #include #include diff --git a/gdk/gdkcairo.c b/gdk/gdkcairo.c index d728fec56f..ef8f5d2fb5 100644 --- a/gdk/gdkcairo.c +++ b/gdk/gdkcairo.c @@ -17,9 +17,7 @@ #include "config.h" -#include "gdkcairo.h" - -#include "gdkinternals.h" +#include "gdkcairoprivate.h" #include diff --git a/gdk/gdkcairocontext.c b/gdk/gdkcairocontext.c index 8f611eeef4..fb54bbeab7 100644 --- a/gdk/gdkcairocontext.c +++ b/gdk/gdkcairocontext.c @@ -25,7 +25,6 @@ #include "gdkcairocontextprivate.h" #include "gdkcairo.h" -#include "gdkinternals.h" /** * GdkCairoContext: diff --git a/gdk/gdkcairoprivate.h b/gdk/gdkcairoprivate.h index 2d1f22d11c..654dec25fa 100644 --- a/gdk/gdkcairoprivate.h +++ b/gdk/gdkcairoprivate.h @@ -18,6 +18,8 @@ #ifndef __GDK_CAIRO_PRIVATE_H__ #define __GDK_CAIRO_PRIVATE_H__ +#include "gdkcairo.h" + #include #include diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c index 3534eee808..e3aea8e653 100644 --- a/gdk/gdkcursor.c +++ b/gdk/gdkcursor.c @@ -31,7 +31,6 @@ #include "gdkcursorprivate.h" #include "gdktexture.h" #include "gdkintl.h" -#include "gdkinternals.h" #include #include diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c index 3869b6d9bc..9f69b189d5 100644 --- a/gdk/gdkdevice.c +++ b/gdk/gdkdevice.c @@ -22,7 +22,6 @@ #include "gdkdeviceprivate.h" #include "gdkdevicetool.h" #include "gdkdisplayprivate.h" -#include "gdkinternals.h" #include "gdkintl.h" #include "gdkkeysprivate.h" diff --git a/gdk/gdkdevicetool.c b/gdk/gdkdevicetool.c index b866d50e15..1a75e5cdfa 100644 --- a/gdk/gdkdevicetool.c +++ b/gdk/gdkdevicetool.c @@ -20,7 +20,7 @@ #include #include "gdkdevicetoolprivate.h" -#include "gdkinternals.h" +#include "gdkenumtypes.h" #include "gdkintl.h" /** diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c index 6916cc0e34..71d47f1d30 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c @@ -31,13 +31,12 @@ #include "gdkclipboardprivate.h" #include "gdkdeviceprivate.h" #include "gdkdisplaymanagerprivate.h" -#include "gdkevents.h" -#include "gdkinternals.h" -#include "gdkmonitorprivate.h" #include "gdkframeclockidleprivate.h" +#include "gdkeventsprivate.h" +#include "gdkglcontextprivate.h" +#include "gdkmonitorprivate.h" #include -#include /** * GdkDisplay: diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c index 557444ff1c..cbd03b7768 100644 --- a/gdk/gdkdisplaymanager.c +++ b/gdk/gdkdisplaymanager.c @@ -27,7 +27,6 @@ #include "gdkconfig.h" #include "gdkdisplaymanagerprivate.h" #include "gdkdisplayprivate.h" -#include "gdkinternals.h" #include "gdkkeysprivate.h" #include "gdkintl.h" diff --git a/gdk/gdkdrawcontext.c b/gdk/gdkdrawcontext.c index d1c5cd0960..fdd6fc9c9d 100644 --- a/gdk/gdkdrawcontext.c +++ b/gdk/gdkdrawcontext.c @@ -22,9 +22,9 @@ #include "gdkdrawcontextprivate.h" -#include "gdkinternals.h" #include "gdkintl.h" #include "gdkprofilerprivate.h" +#include "gdksurfaceprivate.h" /** * GdkDrawContext: diff --git a/gdk/gdkdrop.c b/gdk/gdkdrop.c index fc70822cb0..ff3efbaa4e 100644 --- a/gdk/gdkdrop.c +++ b/gdk/gdkdrop.c @@ -46,9 +46,9 @@ #include "gdkcontentserializer.h" #include "gdkcursor.h" #include "gdkdisplay.h" +#include "gdkdragprivate.h" #include "gdkenumtypes.h" #include "gdkeventsprivate.h" -#include "gdkinternals.h" #include "gdkintl.h" #include "gdkpipeiostreamprivate.h" #include "gdksurface.h" diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index fcfeda6f96..3ee8905ef3 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -28,7 +28,6 @@ #include "gdkdragprivate.h" #include "gdkdropprivate.h" #include "gdkeventsprivate.h" -#include "gdkinternals.h" #include "gdkintl.h" #include "gdkkeysprivate.h" #include "gdkkeysyms.h" diff --git a/gdk/gdkframeclock.c b/gdk/gdkframeclock.c index 6f75e13620..dccf5ffcb1 100644 --- a/gdk/gdkframeclock.c +++ b/gdk/gdkframeclock.c @@ -25,7 +25,6 @@ #include "config.h" #include "gdkframeclockprivate.h" -#include "gdkinternals.h" /** * GdkFrameClock: diff --git a/gdk/gdkframeclockidle.c b/gdk/gdkframeclockidle.c index 363cf6bd55..10c4e5cd2a 100644 --- a/gdk/gdkframeclockidle.c +++ b/gdk/gdkframeclockidle.c @@ -26,7 +26,7 @@ #include "gdkframeclockidleprivate.h" -#include "gdkinternals.h" +#include "gdkdebug.h" #include "gdkframeclockprivate.h" #include "gdk-private.h" #include "gdkprofilerprivate.h" diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c index 417c29d15b..c6a73a7071 100644 --- a/gdk/gdkgl.c +++ b/gdk/gdkgl.c @@ -18,9 +18,9 @@ #include "config.h" #include "gdkcairo.h" -#include "gdkglcontextprivate.h" -#include "gdkinternals.h" +#include "gdkglcontextprivate.h" +#include "gdksurfaceprivate.h" #include #include diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c index 9f8673627f..a692a4f5ef 100644 --- a/gdk/gdkglcontext.c +++ b/gdk/gdkglcontext.c @@ -78,7 +78,6 @@ #include "gdkdebug.h" #include "gdkdisplayprivate.h" -#include "gdkinternals.h" #include "gdkintl.h" #include "gdkmemorytextureprivate.h" diff --git a/gdk/gdkglobals.c b/gdk/gdkglobals.c index 22b4cf0f44..ebbe6a9c39 100644 --- a/gdk/gdkglobals.c +++ b/gdk/gdkglobals.c @@ -25,7 +25,6 @@ #include "config.h" #include "gdktypes.h" -#include "gdkinternals.h" #include diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h deleted file mode 100644 index d3559e46c5..0000000000 --- a/gdk/gdkinternals.h +++ /dev/null @@ -1,43 +0,0 @@ -/* GDK - The GIMP Drawing Kit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -/* Uninstalled header defining types and functions internal to GDK */ - -#ifndef __GDK_INTERNALS_H__ -#define __GDK_INTERNALS_H__ - -#include -#include "gdkenumtypes.h" -#include "gdkeventsprivate.h" -#include "gdksurfaceprivate.h" -#include "gdkdragprivate.h" -#include "gdkkeysprivate.h" -#include "gdkdeviceprivate.h" -#include "gdkseatprivate.h" -#include "gdkdisplayprivate.h" -#include "gdkcairoprivate.h" -#include "gdkglcontextprivate.h" -#include "gdkdebug.h" - -#endif /* __GDK_INTERNALS_H__ */ diff --git a/gdk/gdkkeynames.c b/gdk/gdkkeynames.c index 2672d9b83b..7600f4fc61 100644 --- a/gdk/gdkkeynames.c +++ b/gdk/gdkkeynames.c @@ -25,7 +25,6 @@ #include "config.h" #include "gdkkeysyms.h" -#include "gdkinternals.h" /* Key handling not part of the keymap */ diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c index e649236faa..8cf98feeaf 100644 --- a/gdk/gdkpixbuf-drawable.c +++ b/gdk/gdkpixbuf-drawable.c @@ -25,7 +25,6 @@ #include "gdkpixbuf.h" #include "gdksurface.h" -#include "gdkinternals.h" #include "gdktextureprivate.h" #include diff --git a/gdk/gdkseat.c b/gdk/gdkseat.c index 80abf8eeec..cb09602eaa 100644 --- a/gdk/gdkseat.c +++ b/gdk/gdkseat.c @@ -26,7 +26,6 @@ #include "gdkseatprivate.h" #include "gdkdeviceprivate.h" #include "gdkintl.h" -#include "gdkinternals.h" /** * GdkSeat: diff --git a/gdk/gdkseatdefault.c b/gdk/gdkseatdefault.c index 7e2c83ea93..ce47df8230 100644 --- a/gdk/gdkseatdefault.c +++ b/gdk/gdkseatdefault.c @@ -19,7 +19,6 @@ #include "gdkseatdefaultprivate.h" #include "gdkdevicetoolprivate.h" -#include "gdkinternals.h" typedef struct _GdkSeatDefaultPrivate GdkSeatDefaultPrivate; diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c index 3f2b5189ff..d2031eaf8f 100644 --- a/gdk/gdksurface.c +++ b/gdk/gdksurface.c @@ -30,27 +30,24 @@ #include "gdksurface.h" #include "gdk-private.h" +#include "gdkcontentprovider.h" #include "gdkdeviceprivate.h" #include "gdkdisplayprivate.h" #include "gdkdragsurfaceprivate.h" #include "gdkeventsprivate.h" #include "gdkframeclockidleprivate.h" #include "gdkglcontextprivate.h" -#include "gdkinternals.h" #include "gdkintl.h" #include "gdkmarshalers.h" #include "gdkpopupprivate.h" #include "gdkrectangle.h" #include "gdktoplevelprivate.h" +#include "gdkvulkancontext.h" #include #include -#ifdef GDK_WINDOWING_WAYLAND -#include "wayland/gdkwayland.h" -#endif - /** * GdkSurface: * diff --git a/gdk/gdktexture.c b/gdk/gdktexture.c index e04adfbb33..b79b671a53 100644 --- a/gdk/gdktexture.c +++ b/gdk/gdktexture.c @@ -40,7 +40,6 @@ #include "gdktextureprivate.h" -#include "gdkinternals.h" #include "gdkintl.h" #include "gdkmemorytextureprivate.h" #include "gdkpaintable.h" diff --git a/gdk/gdkvulkancontext.c b/gdk/gdkvulkancontext.c index 39cb955ce0..c3f54bbb7c 100644 --- a/gdk/gdkvulkancontext.c +++ b/gdk/gdkvulkancontext.c @@ -25,7 +25,6 @@ #include "gdkvulkancontextprivate.h" #include "gdkdisplayprivate.h" -#include "gdkinternals.h" #include "gdkintl.h" /** diff --git a/gdk/gdkvulkancontextprivate.h b/gdk/gdkvulkancontextprivate.h index c543f9f997..45149789fc 100644 --- a/gdk/gdkvulkancontextprivate.h +++ b/gdk/gdkvulkancontextprivate.h @@ -23,8 +23,8 @@ #include "gdkvulkancontext.h" +#include "gdkdebug.h" #include "gdkdrawcontextprivate.h" -#include "gdkinternals.h" #ifdef GDK_RENDERING_VULKAN #include diff --git a/gtk/inspector/logs.c b/gtk/inspector/logs.c index b8f22b9504..79f0f7e904 100644 --- a/gtk/inspector/logs.c +++ b/gtk/inspector/logs.c @@ -36,12 +36,12 @@ #include "gtkprivate.h" #include "gtkroot.h" #include "gtkdebug.h" -#include "gdkinternals.h" #include "gtknative.h" #include "gskdebugprivate.h" #include "gskrendererprivate.h" #include "gtkboxlayout.h" +#include "gdk/gdkdebug.h" struct _GtkInspectorLogs { -- 2.30.2